Use correct minio error (#26634) #26639
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Previously, `err` was defined above, checked for `err == nil` and used nowhere else. Hence, the result of `convertMinioErr` would always be `nil`. This leads to a NPE further down the line. That is not intentional, it should convert the error of the most recent operation, not one of its predecessors. Found through https://discord.com/channels/322538954119184384/322538954119184384/1143185780206993550.
GiteaBot
added
the
lgtm/need 2
pull-request-size
bot
added
the
size/XS
delvh
approved these changes
Aug 21, 2023
GiteaBot
added
lgtm/need 1
silverwind
approved these changes
Aug 21, 2023
GiteaBot
added
lgtm/done
silverwind
added
the
reviewed/wait-merge
GiteaBot
removed
the
reviewed/wait-merge
nrdufour
added a commit
to nrdufour/home-ops
that referenced
this pull request
Sep 8, 2023
This PR contains the following updates: | Package | Update | Change | |---|---|---| | [docker.io/gitea/gitea](https://github.com/go-gitea/gitea) | patch | `1.20.3` -> `1.20.4` | --- ### Release Notes <details> <summary>go-gitea/gitea (docker.io/gitea/gitea)</summary> ### [`v1.20.4`](https://github.com/go-gitea/gitea/blob/HEAD/CHANGELOG.md#1204---2023-09-08) [Compare Source](go-gitea/gitea@v1.20.3...v1.20.4) - SECURITY - Check blocklist for emails when adding them to account ([#​26812](go-gitea/gitea#26812)) ([#​26831](go-gitea/gitea#26831)) - ENHANCEMENTS - Add `branch_filter` to hooks API endpoints ([#​26599](go-gitea/gitea#26599)) ([#​26632](go-gitea/gitea#26632)) - Fix incorrect "tabindex" attributes ([#​26733](go-gitea/gitea#26733)) ([#​26734](go-gitea/gitea#26734)) - Use line-height: normal by default ([#​26635](go-gitea/gitea#26635)) ([#​26708](go-gitea/gitea#26708)) - Fix unable to display individual-level project ([#​26198](go-gitea/gitea#26198)) ([#​26636](go-gitea/gitea#26636)) - BUGFIXES - Fix wrong review requested number ([#​26784](go-gitea/gitea#26784)) ([#​26880](go-gitea/gitea#26880)) - Avoid double-unescaping of form value ([#​26853](go-gitea/gitea#26853)) ([#​26863](go-gitea/gitea#26863)) - Redirect from `{repo}/issues/new` to `{repo}/issues/new/choose` when blank issues are disabled ([#​26813](go-gitea/gitea#26813)) ([#​26847](go-gitea/gitea#26847)) - Sync tags when adopting repos ([#​26816](go-gitea/gitea#26816)) ([#​26834](go-gitea/gitea#26834)) - Fix verifyCommits error when push a new branch ([#​26664](go-gitea/gitea#26664)) ([#​26810](go-gitea/gitea#26810)) - Include the GITHUB_TOKEN/GITEA_TOKEN secret for fork pull requests ([#​26759](go-gitea/gitea#26759)) ([#​26806](go-gitea/gitea#26806)) - Fix some slice append usages ([#​26778](go-gitea/gitea#26778)) ([#​26798](go-gitea/gitea#26798)) - Add fix incorrect can_create_org_repo for org owner team ([#​26683](go-gitea/gitea#26683)) ([#​26791](go-gitea/gitea#26791)) - Fix bug for ctx usage ([#​26763](go-gitea/gitea#26763)) - Make issue template field template access correct template data ([#​26698](go-gitea/gitea#26698)) ([#​26709](go-gitea/gitea#26709)) - Use correct minio error ([#​26634](go-gitea/gitea#26634)) ([#​26639](go-gitea/gitea#26639)) - Ignore the trailing slashes when comparing oauth2 redirect_uri ([#​26597](go-gitea/gitea#26597)) ([#​26618](go-gitea/gitea#26618)) - Set errwriter for urfave/cli v1 ([#​26616](go-gitea/gitea#26616)) - Fix reopen logic for agit flow pull request ([#​26399](go-gitea/gitea#26399)) ([#​26613](go-gitea/gitea#26613)) - Fix context filter has no effect in dashboard ([#​26695](go-gitea/gitea#26695)) ([#​26811](go-gitea/gitea#26811)) - Fix being unable to use a repo that prohibits accepting PRs as a PR source. ([#​26785](go-gitea/gitea#26785)) ([#​26790](go-gitea/gitea#26790)) - Fix Page Not Found error ([#​26768](go-gitea/gitea#26768)) </details> --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNi4yMy4yIiwidXBkYXRlZEluVmVyIjoiMzYuMjMuMiIsInRhcmdldEJyYW5jaCI6Im1haW4ifQ==--> Reviewed-on: https://git.home/nrdufour/home-ops/pulls/79 Co-authored-by: Renovate <renovate@ptinem.io> Co-committed-by: Renovate <renovate@ptinem.io>
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Backport #26634 by @delvh
Previously,
errwas defined above, checked forerr == niland used nowhere else.Hence, the result of
convertMinioErrwould always benil.This leads to a NPE further down the line.
That is not intentional, it should convert the error of the most recent operation, not one of its predecessors.
Found through https://discord.com/channels/322538954119184384/322538954119184384/1143185780206993550.